Port 1.1/1.2 scarecrow vibrato fix #2513
Open
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a port of a 1.1/1.2 exclusive fix for Scarecrow song, which can be found here : https://github.com/zeldaret/oot/blob/eb5dac74d6435baf85ced9158d3ff915ba8872ca/src/audio/game/general.c#L1718-L1723
If the last note played on Ocarina had a vibrato (X direction on the stick while playing) before the player records scarecrow song as child, then the vibrato status was not reset, and kept in the first note of the song. Which makes trying to play the same song as adult scarecrow 100% fail.
Credits to flagrama for the steps to reproduce :
Testing
Did the above steps to reproduce and scarecrow song was recorded properly this time.
Here is a patch file with the fix + using the plando of #2486 for convenience.
OoT_Scarecrow_vibrato_11_fix.zip